Changed add and del (now remove) functions according to signatures
described in architecture doc.