Refactored some more db calls to be async