Refactoring json bundle