Add tokenStorageFactory to abstract token storage mechanism