Added courier scaffolding