Hexx::Domain refactored