Move to govdata categories