Add JSON support for extra_props