Added proper json rendering