[#17] Adding case types to case number regexp.