Allow options with underscores to be passed in