adding disabled option support