Optimized windsor source
Optimized some reflection work