Refactored classes to use generics instead of hard-coded strings
Minor/ignore - Renamed variable
Restrict generics to reference types (classes) only to allow null-check for disconnection detection
Refactored and renamed classes