Change default map to match data structure