Renamed class Database to CDatabase