Added support to handle persistent living entities.