Clean up of connection map, easier parameter handling for command pass