refactored deliveries
Merge pull request #107 from RealFilling/fix-dbmodel

Fix dbmodel