Upgrade of the Scala sample
Upgrade of the samples