applied changes to make use of repository and configuration service