Added more general regex