Initial conversion to new decorations API