Updated History

Modified History class, and HistoryMapper, in order to fix the methods.
They work now.

Reviewed by Christopher.