Added condition and condtion set models