Category infra

Fixes #345
These fields shouldn't be touched.