Service library changes

Extract 27-35 and 45-56 as JSONValueToObject ?