Switch to using CommandAttributeScanner for scanning