Feature/message flow