Paul Morris: Allow it to work with multiple activity types.