Some architectural refinements. Syminfo mock is added.