Add support for scala