Add server roles
Remove pending spec