(*) Major refactorings to use full potential of Catel