Enhancements

No need to pass an `$options` array