Usage with MEF added