Maven compilation aligned
Initial data model to support persistence