Add support for object messages