Added MEF support
Refactored
Refactored