Pre Map/Calendar refactorization