Updated to support Origin builds