Changes for zuul ext