Anand/Atirek - moved the logic of loading the entity files, retrieving specific json sections into EntityUtils.