Same for these, no db* dependeneices needed anymore!