Continue support for options array of keys
Update preset options according to #2296