added enabled/disabled support