Update script fixes. New branch model