Adding guids, variants and json support.