added support for custom delivery types