Changes to the Bottle class.