add resolve_modify_field and resolve_modify_field_g function. Rename SERVICE_STRUCT and TREE_STRUCT to DATA_SERVICE and DATA_TREE respectively