Add keys method to iterate options.
Remove redundant validation.