Cater to old formats