Add basic support for on the fly options insertion