Added enabled/disabled feature