Implemented modify support