Added add and remove methods.