Added enabled/disabled configuration