Add regex checks for named groups