Update catalog record handling

 * Make catalog record channels use pointers
 * Add connector pointer into metrics