Added more item detection options