Added more item data support