New console unified connector
Refactor a bit to improve the design