- taking repositories into account and added some logging