added scanning support