refractored roles & servers