Use binary instead of atoms
Make delivery status work again after refactoring