added options for history handling