Updated FileStorage to use JSON