Improved JSON entity support, including actor