Add support for additional response fields