Added Add/Remove methods