Update for modern build artifacts