Refactor: ease the code
Issues Activity was added