Domain objects some changes