Updated model, SQL, XML enities, DB entities, POM.xml