Fix dbmodel

Refactored Deliveries