Made changes to add badge list and activity list.