Adding generated tokens file
Fixing headers
Debugging