Added more Database functionality