Add pointer and reference resolving