Removed generics for MEF