Added change tracking required to support persistence