Switched db calls to loaders