...
... Minor structural changes
fix factory
 fix the to json query