Removed entity base class from mixins