Changes in Database package

Just needs some testing now