Made changes to the API and added comments to options