Fixing annotations in wrong place, still need to rewrite saving mechanisms
Rewriting direct EntityManager queries to Spring Data JPA