Added switch for different scenario and fixed object ids