Improve data repositories