Update build script for more targets