Additional fixes; Group routing;