More refactorings to Catel