Big update on script engine