Switch over to string keys for JSON