Added response factory and contract.