Improve JSON extension