Added JSON module support