better identifier resolution