Updated EntityCatController