Added second mapper, where checking of activities is placed, refactoring