Adding more randomised token generation logic