Lost Mono 2.10 compatibilty because of MEF
Added TODO