Better connect/disconnect handling as well as a UID system