PIM-2124 Created values on the fly