Refactoring ACtivities collections