Add handling of capitalized words