Added two more entities and methods and amde some refactoring