Added Groovy classes