Better assignment tagging