Added more regex