Migrate star-notation feature to new structure