Added add() and set() and fixed remove()