Bug 863312 - Change API to allow for options objects to be passed. Added
support for more fields