Update commands to support Server as a namespace rather than a class.