Change the way configured options are stored and capabilities options are processed