Multiple changes

- Added new entity_filters.
- Refactored manager and classification.