Basic_mapping config structure refactoring