Adding partials and refactor json