Add Modify support part 2