Updated implementation for generic elems.
Updated identifier implementation.