Adds further implementation towards supporting scaling (ongoing)