Updated cluster integration