V3 fix

Please review the changes below.

These commits change the ICSF token to use the same binary tree to keep the object mapping of every session in an application.