Updated Database class!