Add reference resolution for and nodes