Major updates to use regex item matching instead of hard-coded items in configuration file