Work in progress on Entity dependency tracking.