Finish refactoring mapActiviy etc.