Updates to allow for server groups.