Updated MarkupScanner interface