Add more regex for contracted form