switch to unified identifier
optimize code, cache related objects