more explicit naming
Don't store the ref type in the map