Removed JPA primary key generation and added getters/setters to the variables