Adding support for new ornaments