refactor default map