Added support for old json format