Improved entity support.