Added annotations to domain classes