Added more items and code changes.