Added distribution management and updated the group id

Change-Id: I6bbd86ea7c40a87273f83f8eea0396cded5a2acd