Updated some matchers with better regexp