Updated for Windsor.