Added add/remove/get methods.