Changes to the condition class