Improve item updating

Closes #23