Updated the basket to support insert / remove