More history
Adapt to jirafe/core