Move delivery handling into method for overriding
Bump version