Update build support functions