Improved overridability of history, improved Property performance