add disabled support