Repository Overhaul in new Client 1.20