Improved Repository