(fix) Updated for ServerT removal