Updated entity history to use activatable entities