Moved to entity-based architecture