Added support for <options> blocks