Annotated model class, and added JPA support