Bring your bike to the shop when you go and make sure that your front derailleur mount doesn't conflict with it. My wife's bike can take either a water bottle or a pump even though it has two sets of braze-ons. Conveniently for her, my wife likes water and hates pumping up tires.

pubb