Added support for scala