Added support to JSON files