Annotated and add raw ui for messages