Added scale structure and locks