Improved Catel usage