Removed json dependency