Custom System Info Keys in Satellite6

In Satellite6 it was possible to add Custom System Info Keys, i used to
used them to add metadata to servers, like info about ILO addresses, etc.
The best option I can think of in Satellite6 is adding a custom puppet fact on the servers for each key. Is it a better way that I have overlooked?