Fixed to support lgi.io and new properties names