Removed domain requirement, refactoring instead.