Build Scripts updated