Re-added Database.php