Migrated to Windsor 3.1.0