adding monthly data handlers + refactoring