Added dirty tracking support