Use identifier() method rather than mcs_id consistently.