Implement new and better support for entities