BUG-1485: switch ClassTemplate to new range enformcement