JSON files support added