refactored the collection of items, so it can be better use in embedded
applications