Add scan support