Activities refactoring for final version