Removed custom field annotations in favor of using javax.persistence and javax.validation