Added script support for #185