Adding support for scala