Small changes to activity model