Added support for historized entities