Change token generation to ensure unique