add name map support for supervised states