Improve ConditionStatement class - add base validations.