Fixing split logic and adding extra message attributes to interpolateFlag