added new entities and spring configuration