XD-1805 - Support for groovy modules