Refactored Json converters.