Change the qualifier separator from '-' to '.' and add mapping for CR2.