Trying yet another variant of the core domain classes