Fixed build script for latest implementation