Refactored some domain classes