rearchitected bundle updates / storage at the router in order to resolve deadlock issues