Database class added. Not tested