Add support up to 6th version