Updated bean validation annotation, and mapping