Support for bundled messages. First commit