Added JSON and filesystem support