some refactoring, adding some entities