More Wires Fixes

* Added type hints to the Map
* Fixed the parameters being passed to OnClass object not being used