Improved entity payload handling.