Add 2 fields for compatibility with plugin addressing. closes #2393