Finalize JSON marshalling support