Add Groovy compatible version