Shouldn't this also include self.id?