Added scala stuff