Make options optional
Add API return codes
Add API codes to client