Merged scopes between Activity and UserActivity and removed the non-DRY coupling logic post activity save