reverted to the old domain model, this was already used in the front end