lol
History mapper added again
Modified HistoryMapper

	Reviewed by: Simon