Minor modifications to allow more activity types