Added Connector and Generic EventArgs Classes