Updated to Identifier class.'