Cleaning up how TO_JSON method is added to caller