Renamed instance and local variables in HandlerManager for clarity.