Changed db calls