Changes in model to use jpa-1.0