Add Maybe to message parse