Following the pull request 682, added nonce into ServerConfiguration and
changed the classes that needed to be changed