No need to use proxy entities anymore