Added scale support