Changes to support "remove' method