Calendar refactoring due to app DB connection - finished