Cater to old versions and formats