Change create_message API a bit