Updated to latest Scala