(OSD BRANCH) Added support for generating option lists