Database class changes - working on a solution to break up the mammoth Database Adapter file