Improve parsing of the repository config