Update and improve the Groovy language support
Added class references