Some Changes to domain classes.