refactored entities to topics