Added script arg wrapping