Added support for option kinds etc.