Improved repository client