Updates to the W3iCore and JSON parsing