Added more items and requirements