Change BasicData to provide a mapping instead of Fighter