add support for message and todo better for it