Custom field support added for SOAP