I'd probably rather this logic was just inside the Bottle class, personally.