reworked entry addTo and removeFrom methods