WCM-76 Adds pagination for the simulator
WCM-76 SF