Fixes #121 Groovy support back to the core