Added some Scala love