Removed JSON dependency