Fix Unicode plugin for new organization