SLICE-8 Rework mapper initialization

SLICE-8 Rework mapper initialization