This MR is continuation of work to support integration with menu generation codes Tagging @bernius & @fpastore