Added scala changes