Cater to old extension form