Main structure complete, Improvements to Database class