Changes to model for running in GPE. Used Hibernate 4.2.0.Final