Adding capability for new genmesg feature