json generator, servrver calls added