Better support for multiple entities