More work towards adding support for automatic options