Add delivery method and refactor spec file