Add support for multiple 'message sets'