Server and shared_classes changes