Improved checkout scripts