scala support added