Modified Build Scripts