Add Disabled and ShouldBe fields