Add disable/enable functionality