Added support for entities.
Format