Finished some convenience for json