Should we add an Externalizer here to be more performant?