edited all models and manager for jpa