removed JSON parsing and replaced with generic dict substitution