Build out category and correlation type hashes as well