Moved and extended mapping stack.