removed subscription classes
refactored entities