Did my last changes at the moment (Spring Mvc + JPA). Hopefully this is
correct.