Updated DB queries