For that matter, the map could also be configured via application-context.xml in puppet, so when we add new first class category columns, all we need to do is just change the puppet. No need to cut another release! :-)