Update to latest features/limitations