Added and made changes to domain classes.