Add some support for functional groups and enhanced MR writing.