Revised add and remove methods.