Removing jsonpickle requirement