Replaced "positional" pattern checking with regex check