Added Groovy type mappings