Updates to W3iCore and W3iWrapper