Added unique columns
Fix validation for JPA