Improved compatibility with .Net serializer