AddActivity refactor