Improve the future custom entity API.