Changed logic of getting Calendar repository