Change back to DBConnection and fix some calendar methods