Added changes to support JSON updates for clients and some refactoring
added services updates