Main regex made more general