Modified JSON to work with some stub functions