working on Database class