Changed from MEF 2 to full MEF