Next iteration
Handle multiple items insert and remove
Prepare v0.4.1