DetectorMap has been changged..