Added JSON value builder to AVP