Added put/remove (incomplete)