Added support for activity_list