Improve structure (registration & connection out of socket IO) [2]