Fix Identifier class