* Add alias to DOMAIN import (part 4) * Simplify * More integration * Apply suggestions from code review Co-authored-by: G Johansson <goran.johansson@shiftit.se> * Revert "Apply suggestions from code review" This reverts commit 07471d3629bd83ddfc2e254fc4cda3053461570d. --------- Co-authored-by: G Johansson <goran.johansson@shiftit.se>