updated required field tokens to be a little more flexible