Repository usability refactor, hopefully last one.