add factory for intel map
merge conflicts