Refactored to augment the options object