Refactoring

message extract to yaml