Improved Exception handling and enabled JSON via GET parameter