Add scala support