Moved what was into DatabaseConnectionModel to DatabaseConnection