Added class, json sub modules