better identifier saving