Activity Manager refactor