Made HaddHelper a bit more flexible