Added optional fields for items