Perfomance improovments and cluster