removed hardcoded entity names, added one todo