Added some bean validation. Updated deep mapping