Changed to Unity instead of MEF