Add support for deferred messages