Added script and push support