json decorator improvements