added ReferenceNumber support