use items collection. Fixes #21