Fixed Database class