added more items and types