json changes and SOD fixes