Added additional keywords to keep language as similar to assigned projects as possible
Revised trie to support generic object storage, already seeing scanner improvement from 15ms to 0ms