Made classes use the Database class