return_raw attribute added (for local override)