Add Unite support and mappings