Included new condition classes