Add regex check here as well