+ Database class (modificat)