Supporting new repository fields