Move category over to hash based struct