Separate responses and improve JSON repsonses