Just so people know, the reason why the key was not split in the
first place was that the datamodel predated the APM. I think splitting the key is a good idea.
You could preserve the ability to have generic catalog by having
such generic data belong to the acs-lang package.
