Added enabled/disabled state