Improve add-scala script
Improve scala scripts