added support for scala