Make delivery handlers configurable