BUG: Updated helper functions to use new db and schema