Adds preparation for balancing and scaling support