Changed persistence classes to use lombok