Add more Database functionality