Changed add and remove method to work consistently