Changes for ZoeConnector
Changes for ZoeSimulator