Changed some JPA Annotations