Calendar is now handled as a dependency