Changed database connection classes