+ Add new entities
+ Convert to JavaConfig
+ Config JUnit test