Added support for REPLACE_FIELD_ONLY