Added scala support