Build script additions