Updated DB Queries