Adding disabled option support