Labels fix stage 1 --- support in repository