Changing the way I handle wikitables