Closes #182 - Default to convention based mapping