Added services and jpa changes