Add wrappable support for entities