Much more updates.
Added legacy api overide for restart & scale