Cater to older versions and formats