Improved repofields structure for working with it