Updated sim-class to match with UCM