Removed mapping in 2 workflows, and added echo-ing to a protocol.