- Added/Changed JPA annotations and constructors