Adding JSON and File execution support