Improved Critcl support