Modified conditions, added subclasses for condition types