Added proper JSON responses