Updating item parsing to include raw types