Reverted removed imports
Implemented Groovy composites