TODO: what we need is to track the class field...