JsonRepository refactoring