Added support for extra entities.