Restructured for better match Windsor usage.