Modifications to JPAs, added beans, update to Service class