Added change handling to Mapper