Added Database class