Added scanning support