Adjusted Build Scripts