Changed the tokens and keys to case sensitive