Fixing the repo support class