Updated Database queries