Updated ConfigTreeMap to map expression and lookups