Move config to its own file and test and add identity map