Attempt at redesign of domain