Add 'disable' feature