Added scala mode