Controllers added, entity classes updated