Moved delivery details over to common modules/templates