Add support for entities