Refactoring repo (temporary)