Add overrides for add/remove function