Upgraded to latest Scala