Added Session code and JSON version