Add: scala support