refactor plugins for new activity classes