Change API methods to make use of generic 'options' argument