Domain objects some changes
Domain objects some changes