Scala changes for Casa project