Removed dumb JSON requirement