Reworking to work in cluster framework