Added loading from json file