Updated for Windsor 3.2