Ported additional components, rewrote message mapping DSL