Added missing secret fields; Changed order request to have an embedded secret dict that mirrors the secret request type;