Separate add() and addOnce() again