HuiSheng, I examined the patch and all looks good to me. As for the script activities, I don't see why they need to call ScriptManager directly, they might as well call Expression.create and let that method instantiate the correct expression class according to the language. Did I miss something?