Fixed domain model issues