Switched to SecureRandom for identifiers