Refactor bottle/purchase/stored relationships