Migrated towards Catel 3.7 using more IoC