Rewrite entity container check too