Adding support for message api