Upgrade unit loading from json