Added scale out support