Group functionality related changes.