Use identifier class everywhere