diff --git a/core/src/main/java/com/salesforce/slds/shared/RegexPattern.java b/core/src/main/java/com/salesforce/slds/shared/RegexPattern.java
index caeeec4..ba743fa 100644
--- a/core/src/main/java/com/salesforce/slds/shared/RegexPattern.java
+++ b/core/src/main/java/com/salesforce/slds/shared/RegexPattern.java
@@ -45,5 +45,5 @@ public class RegexPattern {
     public static final String VAR_FUNCTION = "var\\(\\s*--lwc-(?<token>[\\w\\d-]+)\\s*(,\\s*(?<fallback>"+
             COLOR_PATTERN + "|" + NUMERIC_PATTERN + "|" + WORD_FRAGMENT + ")\\s*)?\\)";
 
-    public static final String IMPORT_AND_EXPORT_TOKENS = "(:?\\s+|^)import\\s+|(:?\\s+|^)export\\s+";
+    public static final String IMPORT_AND_EXPORT_TOKENS = "(:?^\\s*)import\\s+|(:?^\\s*)export\\s+";
 }
diff --git a/core/src/main/java/com/salesforce/slds/shared/models/core/Entry.java b/core/src/main/java/com/salesforce/slds/shared/models/core/Entry.java
index 89c0ede..ffa40fa 100644
--- a/core/src/main/java/com/salesforce/slds/shared/models/core/Entry.java
+++ b/core/src/main/java/com/salesforce/slds/shared/models/core/Entry.java
@@ -26,17 +26,13 @@ public enum EntityType {LWC, AURA, OTHER}
 
     private String path;
     private final List<String> rawContent;
-    private Bundle bundle;
 
     private String componentName;
     private EntityType entityType;
 
-    private Entry(List<Recommendation> recommendation, List<ComponentOverride> overrides,
+    private Entry(
                   List<Input> inputs, String path, List<String> rawContent,
                   EntityType entityType, String componentName) {
-
-        this.overrides = overrides;
-        this.recommendation = recommendation;
         this.inputs = inputs;
         this.path = path;
         this.rawContent = rawContent;
@@ -44,10 +40,6 @@ private Entry(List<Recommendation> recommendation, List<ComponentOverride> overr
         this.componentName = componentName;
     }
 
-    public boolean hasRecommendation() {
-        return this.getRecommendation().isEmpty() == false;
-    }
-
     public List<Recommendation> getRecommendation() {
         if (this.recommendation == null) {
             this.recommendation = new ArrayList<>();
@@ -60,10 +52,6 @@ public void setRecommendation(List<Recommendation> recommendation) {
         this.recommendation = recommendation;
     }
 
-    public boolean hasOverrides() {
-        return this.getOverrides().isEmpty() == false;
-    }
-
     public List<ComponentOverride> getOverrides() {
         if (this.overrides == null) {
             this.overrides = new ArrayList<>();
@@ -108,18 +96,6 @@ public List<String> getRawContent() {
         return this.rawContent;
     }
 
-    public void setBundle(Bundle bundle) {
-        this.bundle = bundle;
-    }
-
-    public Bundle getBundle() {
-        if (this.bundle == null) {
-            this.bundle = new Bundle();
-        }
-
-        return this.bundle;
-    }
-
     public void setComponentName(String componentName) {
         this.componentName = componentName;
     }
@@ -141,25 +117,17 @@ public static EntryBuilder builder() {
     }
 
     public static class EntryBuilder {
-        private List<Recommendation> recommendation;
         private List<Input> inputs;
         private String path;
         private List<String> rawContent;
-        private List<ComponentOverride> overrides;
         private EntityType entityType;
         private String componentName;
 
-        public EntryBuilder recommendation(List<Recommendation> recommendation) {
-            this.recommendation = recommendation;
-            return this;
-        }
-
         public EntryBuilder inputs(List<Input> inputs) {
             this.inputs = inputs;
             return this;
         }
 
-
         public EntryBuilder path(String path) {
             this.path = path;
             return this;
@@ -170,11 +138,6 @@ public EntryBuilder rawContent(List<String> rawContent) {
             return this;
         }
 
-        public EntryBuilder overrides(List<ComponentOverride> overrides) {
-            this.overrides = overrides;
-            return this;
-        }
-
         public EntryBuilder entityType(EntityType entityType) {
             this.entityType = entityType;
             return this;
@@ -186,7 +149,7 @@ public EntryBuilder componentName(String componentName) {
         }
 
         public Entry build() {
-            return new Entry(recommendation, overrides, inputs, path, rawContent, entityType, componentName);
+            return new Entry(inputs, path, rawContent, entityType, componentName);
         }
     }
 }
diff --git a/core/src/main/java/com/salesforce/slds/shared/models/core/RuleSet.java b/core/src/main/java/com/salesforce/slds/shared/models/core/RuleSet.java
index 909a49e..4e9314a 100644
--- a/core/src/main/java/com/salesforce/slds/shared/models/core/RuleSet.java
+++ b/core/src/main/java/com/salesforce/slds/shared/models/core/RuleSet.java
@@ -31,6 +31,7 @@ public class RuleSet extends Input implements Comparable<RuleSet>, RangeProvider
     private final Range range;
     private final List<String> raw;
     private final List<Style> styles;
+    private List<Style> stylesWithAnnotationType;
 
     private RuleSet(Rule rule, Range range, List<String> raw) {
         this.rule = rule;
@@ -48,28 +49,32 @@ public List<Style> getStyles() {
     }
 
     public List<Style> getStylesWithAnnotationType() {
-        Optional<AnnotationType> ruleAnnotationType = getAnnotationType();
-        List<Style> annotatedStyles = new ArrayList<>();
-
-        for (Style style : getStyles()) {
-            Style.StyleBuilder styleBuilder = Style.builder();
-            styleBuilder
-                    .property(style.getProperty())
-                    .value(style.getValue())
-                    .range(style.getRange())
-                    .declaration(style.getDeclaration())
-                    .condition(style.getCondition());
-
-            if (style.getAnnotationType() == null) {
-                styleBuilder.annotationType(ruleAnnotationType.orElse(AnnotationType.NONE));
-            } else {
-                styleBuilder.annotationType(style.getAnnotationType());
+        if (stylesWithAnnotationType == null) {
+            Optional<AnnotationType> ruleAnnotationType = getAnnotationType();
+            List<Style> annotatedStyles = new ArrayList<>();
+
+            for (Style style : getStyles()) {
+                Style.StyleBuilder styleBuilder = Style.builder();
+                styleBuilder
+                        .property(style.getProperty())
+                        .value(style.getValue())
+                        .range(style.getRange())
+                        .declaration(style.getDeclaration())
+                        .condition(style.getCondition());
+
+                if (style.getAnnotationType() == null) {
+                    styleBuilder.annotationType(ruleAnnotationType.orElse(AnnotationType.NONE));
+                } else {
+                    styleBuilder.annotationType(style.getAnnotationType());
+                }
+
+                annotatedStyles.add(styleBuilder.build());
             }
 
-            annotatedStyles.add(styleBuilder.build());
+            stylesWithAnnotationType = annotatedStyles;
         }
 
-        return annotatedStyles;
+        return stylesWithAnnotationType;
     }
 
     public List<Annotation> getAnnotations() {
diff --git a/core/src/main/java/com/salesforce/slds/shared/utils/EntryUtilities.java b/core/src/main/java/com/salesforce/slds/shared/utils/EntryUtilities.java
index 3d8c912..55ae965 100644
--- a/core/src/main/java/com/salesforce/slds/shared/utils/EntryUtilities.java
+++ b/core/src/main/java/com/salesforce/slds/shared/utils/EntryUtilities.java
@@ -7,42 +7,42 @@
 package com.salesforce.slds.shared.utils;
 
 import com.salesforce.slds.shared.RegexPattern;
+import com.salesforce.slds.shared.models.core.Bundle;
 import com.salesforce.slds.shared.models.core.Entry;
 import com.salesforce.slds.shared.models.core.Input;
 
+import java.util.List;
 import java.util.Optional;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 public class EntryUtilities {
 
     private static Pattern IMPORT_AND_EXPORT_PATTERN = Pattern.compile(RegexPattern.IMPORT_AND_EXPORT_TOKENS);
 
-    public static Entry.EntityType getType(Entry entry) {
+    public static Entry.EntityType getType(Bundle bundle) {
+        List<Entry.EntityType> types = bundle.getEntries().stream()
+                .map(entry -> {
 
-        if (entry.getPath().endsWith(".js")) {
-            if (entry.getRawContent().stream()
-                    .anyMatch(content -> IMPORT_AND_EXPORT_PATTERN.matcher(content).find())) {
-                return Entry.EntityType.LWC;
-            }
-        }
+                    if (entry.getPath().endsWith(".js")) {
+                        if (entry.getRawContent().stream()
+                                .anyMatch(content -> IMPORT_AND_EXPORT_PATTERN.matcher(content).find())) {
+                            return Entry.EntityType.LWC;
+                        }
+                    }
 
-        for (Input input : entry.getInputs()) {
-            Optional<Entry.EntityType> type = getType(entry.getComponentName(), input);
-            if (type.isPresent()) {
-                return type.get();
-            }
-        }
+                    for (Input input : entry.getInputs()) {
+                        Optional<Entry.EntityType> type = getType(entry.getComponentName(), input);
+                        if (type.isPresent()) {
+                            return type.get();
+                        }
+                    }
 
-        for (Entry bundledEntry : entry.getBundle().getEntries()) {
-            for (Input input : bundledEntry.getInputs()) {
-                Optional<Entry.EntityType> type = getType(bundledEntry.getComponentName(), input);
-                if (type.isPresent()) {
-                    return type.get();
-                }
-            }
-        }
+                    return Entry.EntityType.OTHER;
+                }).filter(entityType -> entityType != Entry.EntityType.OTHER)
+                .distinct().collect(Collectors.toList());
 
-        return Entry.EntityType.OTHER;
+        return types.isEmpty() ? Entry.EntityType.OTHER : types.get(0);
     }
 
     static Optional<Entry.EntityType> getType(String componentName, Input input) {
@@ -79,27 +79,22 @@ static Optional<Entry.EntityType> getType(String componentName, Input input) {
         return Optional.empty();
     }
 
-    public static String getComponentName(Entry entry) {
-        if (entry.getEntityType() != Entry.EntityType.OTHER) {
-            boolean containMarkupOrStyle = entry.getInputs().stream()
-                    .anyMatch(input -> input.getType() == Input.Type.MARKUP || input.getType() == Input.Type.STYLE);
+    public static String getComponentName(Bundle bundle) {
+        List<String> possibleName = bundle.getEntries().stream()
+                .map(entry -> {
+                    if (entry.getEntityType() != Entry.EntityType.OTHER) {
+                        boolean containMarkupOrStyle = entry.getInputs().stream()
+                                .anyMatch(input -> input.getType() == Input.Type.MARKUP || input.getType() == Input.Type.STYLE);
 
-            if (containMarkupOrStyle) {
-                return extractComponentName(entry.getPath());
-            }
-
-            for (Entry bundledEntry : entry.getBundle().getEntries()) {
-                containMarkupOrStyle = bundledEntry.getInputs().stream()
-                        .anyMatch(input -> input.getType() == Input.Type.MARKUP || input.getType() == Input.Type.STYLE);
-
-                if (containMarkupOrStyle) {
-                    return extractComponentName(bundledEntry.getPath());
-                }
-            }
-        }
+                        if (containMarkupOrStyle) {
+                            return extractComponentName(entry.getPath());
+                        }
+                    }
 
+                    return extractComponentName(entry.getPath());
+                }).distinct().collect(Collectors.toList());
 
-        return extractComponentName(entry.getPath());
+        return possibleName.get(0);
     }
 
     private static String extractComponentName(String path) {
diff --git a/core/src/main/java/com/salesforce/slds/tokens/registry/TokenRegistry.java b/core/src/main/java/com/salesforce/slds/tokens/registry/TokenRegistry.java
index 09bd4d9..52a20a8 100644
--- a/core/src/main/java/com/salesforce/slds/tokens/registry/TokenRegistry.java
+++ b/core/src/main/java/com/salesforce/slds/tokens/registry/TokenRegistry.java
@@ -31,4 +31,6 @@ public interface TokenRegistry {
 
     List<DesignToken> getDesignTokens();
 
+    Set<String> getValidUtilityClasses();
+
 }
diff --git a/core/src/main/java/com/salesforce/slds/tokens/registry/TokenRegistryImpl.java b/core/src/main/java/com/salesforce/slds/tokens/registry/TokenRegistryImpl.java
index 5e2b6d3..6706144 100644
--- a/core/src/main/java/com/salesforce/slds/tokens/registry/TokenRegistryImpl.java
+++ b/core/src/main/java/com/salesforce/slds/tokens/registry/TokenRegistryImpl.java
@@ -24,9 +24,12 @@
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
 
 import java.io.IOException;
 import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
 
@@ -39,6 +42,33 @@ public Set<ComponentBlueprint> getComponentBlueprints() {
         return getComponentsInternal();
     }
 
+    @Override
+    public Set<String> getValidUtilityClasses() {
+        if (this.validUtilityClasses == null) {
+            this.validUtilityClasses = new HashSet<>();
+
+            getComponentBlueprints().stream()
+                    .forEach(componentBlueprint -> {
+                        componentBlueprint.getSelectors().forEach(selector ->
+                                validUtilityClasses.addAll(processTokens(selector)));
+
+                        componentBlueprint.getTokens().forEach((name, componentDesignToken) -> {
+                           componentDesignToken.getCssSelectors().forEach(selector ->
+                                   validUtilityClasses.addAll(processTokens(selector)));
+                        });
+                    });
+
+            getUtilityClasses().stream()
+                    .map(utilityClass -> Arrays.asList(utilityClass.getName().split(" ")))
+                    .flatMap(List::stream)
+                    .forEach(s ->
+                        validUtilityClasses.addAll(processTokens(s.trim()))
+                    );
+        }
+
+        return this.validUtilityClasses;
+    }
+
     @Override
     public Optional<ComponentBlueprint> getComponentBlueprint(String component) {
         return getComponentsInternal().stream()
@@ -93,8 +123,10 @@ public void afterPropertiesSet() throws Exception {
     private Set<ComponentBlueprint> components;
     private Map<String, DesignToken> tokens;
     private List<UtilityClass> utilityClasses;
+    private Set<String> validUtilityClasses;
     private ObjectMapper mapper = new ObjectMapper();
-
+    private static final String SLDS = "slds-[^\\s,\\[:\\]\\.\";]*";
+    private static final Pattern SLDSPattern = Pattern.compile(SLDS);
 
     private Set<ComponentBlueprint> getComponentsInternal() {
         if (this.components == null) {
@@ -147,6 +179,18 @@ public Map<String, DesignToken> getDesignTokensInternal() {
         return this.tokens;
     }
 
+    private Set<String> processTokens(String tokens) {
+        Set<String> possibleTokens = new HashSet<>();
+
+        Matcher matcher = SLDSPattern.matcher(tokens);
+
+        while(matcher.find()) {
+            possibleTokens.add(matcher.group());
+        }
+
+        return possibleTokens;
+     }
+
     private static class TokenStatusDeserializer extends StdDeserializer<TokenStatus> {
 
         public TokenStatusDeserializer() {super(TokenStatus.class);}
diff --git a/core/src/main/java/com/salesforce/slds/validation/runners/ValidateRunner.java b/core/src/main/java/com/salesforce/slds/validation/runners/ValidateRunner.java
index c98594c..9c56c39 100644
--- a/core/src/main/java/com/salesforce/slds/validation/runners/ValidateRunner.java
+++ b/core/src/main/java/com/salesforce/slds/validation/runners/ValidateRunner.java
@@ -38,7 +38,7 @@ public class ValidateRunner implements Runnable {
     private final Processor processor;
 
     private Context context = new Context();
-    private Entry entry;
+    private Bundle bundle;
     protected boolean completed = false;
 
     @Autowired
@@ -49,12 +49,12 @@ public ValidateRunner(List<Validator> validators,
         this.processor = processor;
     }
 
-    public Entry getEntry() {
-        return entry;
+    public Bundle getBundle() {
+        return bundle;
     }
 
-    public void setEntry(Entry entry) {
-        this.entry = entry;
+    public void setBundle(Bundle bundle) {
+        this.bundle = bundle;
     }
 
     public Context getContext() {
@@ -70,33 +70,32 @@ public boolean isCompleted() {
     }
 
     protected void setup() {
-        entry.setInputs(getInputs(entry));
         setupBundle();
-        setupContext();
     }
 
-    protected void setupContext() {
-        if (entry.getComponentName() == null) {
-            entry.setComponentName(getComponentName(entry));
-        }
+    protected void setupBundle() {
+        getBundle().getEntries().forEach(e -> e.setInputs(getInputs(e)));
 
-        if (entry.getEntityType() == null) {
-            entry.setEntityType(getType(entry));
-        }
-    }
+        String componentName = getComponentName(getBundle());
+        Entry.EntityType type = getType(getBundle());
 
-    protected void setupBundle() {
-        entry.getBundle().getEntries().forEach(e ->
-                e.setInputs(getInputs(e))
-        );
+        getBundle().getEntries().forEach(entry -> {
+            if (entry.getComponentName() == null) {
+                entry.setComponentName(componentName);
+            }
+
+            if (entry.getEntityType() == null) {
+                entry.setEntityType(type);
+            }
+        });
     }
 
-    protected String getComponentName(Entry entry) {
-        return EntryUtilities.getComponentName(entry);
+    protected String getComponentName(Bundle bundle) {
+        return EntryUtilities.getComponentName(bundle);
     }
 
-    protected Entry.EntityType getType(Entry entry) {
-        return EntryUtilities.getType(entry);
+    protected Entry.EntityType getType(Bundle bundle) {
+        return EntryUtilities.getType(bundle);
     }
 
     @Override
@@ -104,32 +103,31 @@ public void run() {
         if (context.isEnabled(ContextKey.GLOBAL)) {
             setup();
 
-            List<Recommendation> recommendations = validators.parallelStream()
-                    .filter(validator -> validator instanceof RecommendationValidator)
-                    .map(validator -> (RecommendationValidator) validator)
-                    .map(validator -> validator.matches(entry, context))
-                    .flatMap(List::stream)
-                    .collect(aggregator.toList());
+            for (Entry entry : bundle.getEntries()) {
+
+                List<Recommendation> recommendations = validators.parallelStream()
+                        .filter(validator -> validator instanceof RecommendationValidator)
+                        .map(validator -> (RecommendationValidator) validator)
+                        .map(validator -> validator.matches(entry, bundle, context))
+                        .flatMap(List::stream)
+                        .collect(aggregator.toList());
 
-            entry.setRecommendation(processor.process(recommendations));
+                entry.setRecommendation(processor.process(recommendations));
 
-            List<ComponentOverride> overrides = validators.parallelStream()
-                    .filter(validator -> validator instanceof OverrideValidator)
-                    .map(validator -> (OverrideValidator) validator)
-                    .map(validator -> validator.getOverrides(entry, context))
-                    .flatMap(List::stream)
-                    .collect(Collectors.toList());
+                List<ComponentOverride> overrides = validators.parallelStream()
+                        .filter(validator -> validator instanceof OverrideValidator)
+                        .map(validator -> (OverrideValidator) validator)
+                        .map(validator -> validator.getOverrides(entry, bundle, context))
+                        .flatMap(List::stream)
+                        .collect(Collectors.toList());
 
-            entry.setOverrides(overrides);
+                entry.setOverrides(overrides);
+            }
         }
 
         completed = true;
     }
 
-    public List<Input> getInputs() {
-        return getInputs(entry);
-    }
-
     protected List<Input> getInputs(Entry entry) {
         List<Input> inputs = new ArrayList<>();
 
diff --git a/core/src/main/java/com/salesforce/slds/validation/utils/JavascriptValidationUtilities.java b/core/src/main/java/com/salesforce/slds/validation/utils/JavascriptValidationUtilities.java
index b77ab8e..34074e6 100644
--- a/core/src/main/java/com/salesforce/slds/validation/utils/JavascriptValidationUtilities.java
+++ b/core/src/main/java/com/salesforce/slds/validation/utils/JavascriptValidationUtilities.java
@@ -66,7 +66,6 @@ public Recommendation match(Block block, List<DesignToken> tokens, List<String>
     }
 
     public Set<ProcessingItem> getStyleValues(Block block, List<String> rawContent) {
-        Pattern SLDS = Pattern.compile("slds-[^\\s\"\';\\.,:\\)\\[]*");
         Matcher matcher = SLDS.matcher(block.getValue());
 
         Set<String> styles = new LinkedHashSet<>();
@@ -118,4 +117,6 @@ public Map<String, List<ProcessingItem>> getPossibleValues(Block block, List<Str
 
         return styles;
     }
+
+    private static final Pattern SLDS = Pattern.compile("slds-[^\\s\"\';\\.,:\\)\\[]*");
 }
diff --git a/core/src/main/java/com/salesforce/slds/validation/validators/BaseValidator.java b/core/src/main/java/com/salesforce/slds/validation/validators/BaseValidator.java
index fbc119c..52ea5b3 100644
--- a/core/src/main/java/com/salesforce/slds/validation/validators/BaseValidator.java
+++ b/core/src/main/java/com/salesforce/slds/validation/validators/BaseValidator.java
@@ -9,6 +9,7 @@
 
 import com.salesforce.slds.shared.models.context.Context;
 import com.salesforce.slds.shared.models.context.ContextKey;
+import com.salesforce.slds.shared.models.core.Bundle;
 import com.salesforce.slds.tokens.models.DesignToken;
 import com.salesforce.slds.tokens.registry.TokenRegistry;
 import com.salesforce.slds.shared.models.core.Entry;
@@ -49,7 +50,7 @@ public void afterPropertiesSet() {
     }
 
     @Override
-    public List<Recommendation> matches(Entry entry, Context context) {
+    public List<Recommendation> matches(Entry entry, Bundle bundle, Context context) {
         if (context.isEnabled(ContextKey.DESIGN_TOKEN)) {
             return entry.getInputs().stream()
                     .filter(input -> input.getType() == Input.Type.STYLE)
diff --git a/core/src/main/java/com/salesforce/slds/validation/validators/SLDSValidator.java b/core/src/main/java/com/salesforce/slds/validation/validators/SLDSValidator.java
deleted file mode 100644
index 587c466..0000000
--- a/core/src/main/java/com/salesforce/slds/validation/validators/SLDSValidator.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2018, salesforce.com, inc.
- * All rights reserved.
- * SPDX-License-Identifier: BSD-3-Clause
- * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/BSD-3-Clause
- */
-
-package com.salesforce.slds.validation.validators;
-
-import com.salesforce.slds.tokens.models.DesignToken;
-import com.salesforce.slds.tokens.registry.TokenRegistry;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public abstract class SLDSValidator implements InitializingBean {
-
-    @Autowired
-    TokenRegistry tokenRegistry;
-
-    protected final Map<String, DesignToken> DESIGN_TOKENS = new LinkedHashMap<>();
-    protected final Set<String> VALID_UTILITY_CLASSES = new LinkedHashSet<>();
-
-    static Pattern SLDS = Pattern.compile("slds-[^\\s,\\[:\\]\\.\";]*");
-
-    @Override
-    public void afterPropertiesSet(){
-        setValidUtilityClasses();
-        setDesignTokenLists();
-    }
-
-    private void setValidUtilityClasses(){
-
-        tokenRegistry.getComponentBlueprints().stream()
-                .forEach(componentBlueprint -> {
-                    componentBlueprint.getSelectors().forEach(selector ->
-                            VALID_UTILITY_CLASSES.addAll(processTokens(selector))
-                    );
-
-                    componentBlueprint.getTokens().forEach((name, componentDesignToken) -> {
-                        componentDesignToken.getCssSelectors().forEach(selector ->
-                                VALID_UTILITY_CLASSES.addAll(processTokens(selector))
-                        );
-                    });
-
-                });
-
-        tokenRegistry.getUtilityClasses().stream()
-                .map(utilityClass -> Arrays.asList(utilityClass.getName().split(" ")))
-                .flatMap(List::stream)
-                .forEach(s -> {
-                    String value = s.trim();
-                    VALID_UTILITY_CLASSES.addAll(processTokens(value));
-                });
-
-    }
-
-    private void setDesignTokenLists() {
-
-        tokenRegistry.getDesignTokens().forEach(designToken -> {
-            DESIGN_TOKENS.put(designToken.getName(), designToken);
-        });
-
-    }
-
-    public Set<String> processTokens(String tokens) {
-        Set<String> possibleTokens = new HashSet<>();
-
-        Matcher matcher = SLDS.matcher(tokens);
-
-        while(matcher.find()) {
-            possibleTokens.add(matcher.group());
-        }
-
-        return possibleTokens;
-    }
-}
diff --git a/core/src/main/java/com/salesforce/slds/validation/validators/impl/override/ComponentOverrideValidator.java b/core/src/main/java/com/salesforce/slds/validation/validators/impl/override/ComponentOverrideValidator.java
index 661d75d..4bd7082 100644
--- a/core/src/main/java/com/salesforce/slds/validation/validators/impl/override/ComponentOverrideValidator.java
+++ b/core/src/main/java/com/salesforce/slds/validation/validators/impl/override/ComponentOverrideValidator.java
@@ -12,28 +12,26 @@
 import com.salesforce.omakase.ast.Rule;
 import com.salesforce.slds.shared.models.context.Context;
 import com.salesforce.slds.shared.models.context.ContextKey;
+import com.salesforce.slds.shared.models.core.Bundle;
 import com.salesforce.slds.shared.models.core.Entry;
 import com.salesforce.slds.shared.models.core.Input;
-import com.salesforce.slds.shared.models.locations.Location;
-import com.salesforce.slds.shared.models.locations.Range;
 import com.salesforce.slds.shared.models.override.ComponentOverride;
 import com.salesforce.slds.shared.models.recommendation.Action;
 import com.salesforce.slds.shared.models.recommendation.ActionType;
-import com.salesforce.slds.shared.models.recommendation.Item;
-import com.salesforce.slds.shared.models.recommendation.RelatedInformation;
-import com.salesforce.slds.validation.validators.SLDSValidator;
+import com.salesforce.slds.tokens.registry.TokenRegistry;
 import com.salesforce.slds.validation.validators.interfaces.OverrideValidator;
-import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
 
 import java.util.*;
 
 @Component
-public class ComponentOverrideValidator extends SLDSValidator implements OverrideValidator, InitializingBean {
+public class ComponentOverrideValidator implements OverrideValidator {
 
+    @Autowired
+    TokenRegistry tokenRegistry;
     @Override
-    public List<ComponentOverride> getOverrides(Entry entry, Context context){
+    public List<ComponentOverride> getOverrides(Entry entry, Bundle bundle, Context context){
         List<ComponentOverride> componentOverrides = Lists.newArrayList();
 
         if (context.isEnabled(ContextKey.OVERRIDE)) {
@@ -89,7 +87,7 @@ public String getSldsClassAsString(String selector){
         return null;
     }
 
-    // Find occurence of .slds in selector any location
+    // Find occurrence of .slds in selector any location
     Boolean componentOverrideSoftMatch(String selector){
         String[] selectorsArr = selector.split(" ");
         if (selectorsArr[selectorsArr.length-1].contains(".slds")){
@@ -100,6 +98,7 @@ Boolean componentOverrideSoftMatch(String selector){
     }
 
     public Boolean componentOverrideSLDSMatch(String selector){
-        return componentOverrideSoftMatch(selector) && VALID_UTILITY_CLASSES.contains(getSldsClassAsString(selector));
+        return componentOverrideSoftMatch(selector) &&
+                tokenRegistry.getValidUtilityClasses().contains(getSldsClassAsString(selector));
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/com/salesforce/slds/validation/validators/impl/recommendation/DesignTokenValidator.java b/core/src/main/java/com/salesforce/slds/validation/validators/impl/recommendation/DesignTokenValidator.java
index d7a6ea5..e2122f9 100644
--- a/core/src/main/java/com/salesforce/slds/validation/validators/impl/recommendation/DesignTokenValidator.java
+++ b/core/src/main/java/com/salesforce/slds/validation/validators/impl/recommendation/DesignTokenValidator.java
@@ -13,6 +13,7 @@
 import com.salesforce.slds.shared.converters.tokens.TokenType;
 import com.salesforce.slds.shared.models.context.Context;
 import com.salesforce.slds.shared.models.context.ContextKey;
+import com.salesforce.slds.shared.models.core.Bundle;
 import com.salesforce.slds.shared.models.core.Entry;
 import com.salesforce.slds.shared.models.core.Input;
 import com.salesforce.slds.shared.models.core.Style;
@@ -24,8 +25,8 @@
 import com.salesforce.slds.shared.utils.ResourceUtilities;
 import com.salesforce.slds.tokens.models.DesignToken;
 import com.salesforce.slds.tokens.models.TokenStatus;
+import com.salesforce.slds.tokens.registry.TokenRegistry;
 import com.salesforce.slds.validation.utils.CSSValidationUtilities;
-import com.salesforce.slds.validation.validators.SLDSValidator;
 import com.salesforce.slds.validation.validators.interfaces.RecommendationValidator;
 import com.salesforce.slds.validation.validators.models.Properties;
 import org.springframework.beans.factory.InitializingBean;
@@ -40,15 +41,13 @@
 import java.util.stream.Collectors;
 
 @Component
-public class DesignTokenValidator extends SLDSValidator implements RecommendationValidator, InitializingBean {
+public class DesignTokenValidator implements RecommendationValidator, InitializingBean {
 
     private Pattern VAR_FUNCTION_PATTERN = Pattern.compile(RegexPattern.VAR_FUNCTION, Pattern.CASE_INSENSITIVE);
     private Map<String, String> DEPRECATED_TOKENS_FROM_RESOURCES = new LinkedHashMap<>();
 
     @Override
     public void afterPropertiesSet() {
-        super.afterPropertiesSet();
-
         buildEntries().asTokens().forEach(designToken ->
                 DEPRECATED_TOKENS_FROM_RESOURCES.put(designToken.getValue(), designToken.getName())
         );
@@ -57,8 +56,11 @@ public void afterPropertiesSet() {
     @Autowired
     CSSValidationUtilities cssValidationUtilities;
 
+    @Autowired
+    TokenRegistry tokenRegistry;
+
     @Override
-    public List<Recommendation> matches(Entry entry, Context context) {
+    public List<Recommendation> matches(Entry entry, Bundle bundle, Context context) {
         List<Recommendation> recommendations = new ArrayList<>();
 
         if (context.isEnabled(ContextKey.DESIGN_TOKEN) && (context.isEnabled(ContextKey.DEPRECATED) ||
@@ -113,8 +115,9 @@ private Set<Item> provideRecommendations(Style style, Context context, Entry.Ent
 
             for (String value : values) {
 
-                DesignToken designToken = DESIGN_TOKENS.get(value);
-                if (designToken == null || designToken.getDeprecated() != null || designToken.getStatus() == TokenStatus.DELETED ) {
+                Optional<DesignToken> designToken = tokenRegistry.getDesignToken(value);
+                if (designToken.isPresent() == false || designToken.get().getDeprecated() != null
+                        || designToken.get().getStatus() == TokenStatus.DELETED ) {
                     Range range = cssValidationUtilities.getValueSpecificRange(originalValue, style, rawContents);
                     Action.ActionBuilder actionBuilder = Action.builder().range(range).fileType(Input.Type.STYLE);
                     Optional<DesignToken> updatedToken = getUpdatedToken(value);
@@ -167,11 +170,11 @@ private Set<Item> provideRecommendations(Style style, Context context, Entry.Ent
     }
 
     private Optional<DesignToken> getUpdatedToken(String token) {
-        DesignToken designToken = DESIGN_TOKENS.get(token);
+        Optional<DesignToken> designToken = tokenRegistry.getDesignToken(token);
         String updatedToken = null;
 
-        if (designToken != null && designToken.getDeprecated() != null && designToken.getComment() != null) {
-            updatedToken = cssValidationUtilities.getTokenNameFromComment(designToken.getComment());
+        if (designToken.isPresent() && designToken.get().getDeprecated() != null && designToken.get().getComment() != null) {
+            updatedToken = cssValidationUtilities.getTokenNameFromComment(designToken.get().getComment());
         }
 
         if (updatedToken == null && DEPRECATED_TOKENS_FROM_RESOURCES.containsKey(token)) {
@@ -179,7 +182,7 @@ private Optional<DesignToken> getUpdatedToken(String token) {
         }
 
         if (updatedToken != null) {
-            return Optional.ofNullable(DESIGN_TOKENS.get(updatedToken));
+            return tokenRegistry.getDesignToken(updatedToken);
         }
 
         return Optional.empty();
diff --git a/core/src/main/java/com/salesforce/slds/validation/validators/impl/recommendation/InvalidValidator.java b/core/src/main/java/com/salesforce/slds/validation/validators/impl/recommendation/InvalidValidator.java
index b5e24be..40bdfc1 100644
--- a/core/src/main/java/com/salesforce/slds/validation/validators/impl/recommendation/InvalidValidator.java
+++ b/core/src/main/java/com/salesforce/slds/validation/validators/impl/recommendation/InvalidValidator.java
@@ -11,19 +11,15 @@
 import com.google.common.collect.Sets;
 import com.salesforce.slds.shared.models.context.Context;
 import com.salesforce.slds.shared.models.context.ContextKey;
-import com.salesforce.slds.shared.models.core.Block;
-import com.salesforce.slds.shared.models.core.Entry;
-import com.salesforce.slds.shared.models.core.HTMLElement;
-import com.salesforce.slds.shared.models.core.Input;
+import com.salesforce.slds.shared.models.core.*;
 import com.salesforce.slds.shared.models.recommendation.Action;
 import com.salesforce.slds.shared.models.recommendation.ActionType;
 import com.salesforce.slds.shared.models.recommendation.Item;
 import com.salesforce.slds.shared.models.recommendation.Recommendation;
+import com.salesforce.slds.tokens.registry.TokenRegistry;
 import com.salesforce.slds.validation.utils.JavascriptValidationUtilities;
-import com.salesforce.slds.validation.validators.SLDSValidator;
 import com.salesforce.slds.validation.validators.interfaces.RecommendationValidator;
 import com.salesforce.slds.validation.validators.models.ProcessingItem;
-import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
@@ -38,13 +34,16 @@
  * Invalid CSS is processed within @{@link DesignTokenValidator}
  */
 @Component
-public class InvalidValidator extends SLDSValidator implements RecommendationValidator, InitializingBean {
+public class InvalidValidator implements RecommendationValidator {
 
     @Autowired
     JavascriptValidationUtilities javascriptValidationUtilities;
 
+    @Autowired
+    TokenRegistry tokenRegistry;
+
     @Override
-    public List<Recommendation> matches(Entry entry, Context context) {
+    public List<Recommendation> matches(Entry entry, Bundle bundle, Context context) {
         List<Recommendation> recommendations = new ArrayList<>();
 
         if (context.isEnabled(ContextKey.INVALID)) {
@@ -134,7 +133,7 @@ public Set<Item> extractInvalidTokens(Set<ProcessingItem> tokens) {
             return PASS_THROUGH.matcher(s.getValue()).matches();
         }).collect(Collectors.groupingBy(ProcessingItem::getValue));
 
-        return Sets.difference(filtered.keySet(), VALID_UTILITY_CLASSES)
+        return Sets.difference(filtered.keySet(), tokenRegistry.getValidUtilityClasses())
                 .stream()
                 .map(s -> {
                     List<ProcessingItem> items = filtered.get(s);
diff --git a/core/src/main/java/com/salesforce/slds/validation/validators/impl/recommendation/PriorityValidator.java b/core/src/main/java/com/salesforce/slds/validation/validators/impl/recommendation/PriorityValidator.java
index bedaae6..ab80976 100644
--- a/core/src/main/java/com/salesforce/slds/validation/validators/impl/recommendation/PriorityValidator.java
+++ b/core/src/main/java/com/salesforce/slds/validation/validators/impl/recommendation/PriorityValidator.java
@@ -9,6 +9,7 @@
 
 import com.salesforce.slds.shared.models.context.Context;
 import com.salesforce.slds.shared.models.context.ContextKey;
+import com.salesforce.slds.shared.models.core.Bundle;
 import com.salesforce.slds.shared.utils.ResourceUtilities;
 import com.salesforce.slds.tokens.models.DesignToken;
 import com.salesforce.slds.shared.models.core.Entry;
@@ -54,7 +55,7 @@ public void afterPropertiesSet() {
     }
 
     @Override
-    public List<Recommendation> matches(Entry entry, Context context) {
+    public List<Recommendation> matches(Entry entry, Bundle bundle, Context context) {
 
         List<DesignToken> tokens = new ArrayList<>();
         if (context.isEnabled(ContextKey.BEM)) {
diff --git a/core/src/main/java/com/salesforce/slds/validation/validators/impl/recommendation/UtilityClassValidator.java b/core/src/main/java/com/salesforce/slds/validation/validators/impl/recommendation/UtilityClassValidator.java
index 0d766c8..b6af347 100644
--- a/core/src/main/java/com/salesforce/slds/validation/validators/impl/recommendation/UtilityClassValidator.java
+++ b/core/src/main/java/com/salesforce/slds/validation/validators/impl/recommendation/UtilityClassValidator.java
@@ -69,11 +69,11 @@ private UtilityClass cleanseName(UtilityClass utilityClass) {
     }
 
     @Override
-    public List<Recommendation> matches(Entry entry, Context context) {
+    public List<Recommendation> matches(Entry entry, Bundle bundle, Context context) {
         List<Recommendation> recommendations = new ArrayList<>();
 
         if (context.isEnabled(ContextKey.UTILITY_CLASS)) {
-            final List<HTMLElement> elements = entry.getBundle().getInputs().stream()
+            final List<HTMLElement> elements = bundle.getInputs().stream()
                     .sequential().map(Input::asElement).filter(Objects::nonNull)
                     .collect(Collectors.toList());
 
diff --git a/core/src/main/java/com/salesforce/slds/validation/validators/interfaces/OverrideValidator.java b/core/src/main/java/com/salesforce/slds/validation/validators/interfaces/OverrideValidator.java
index a584cae..d4b7c84 100644
--- a/core/src/main/java/com/salesforce/slds/validation/validators/interfaces/OverrideValidator.java
+++ b/core/src/main/java/com/salesforce/slds/validation/validators/interfaces/OverrideValidator.java
@@ -8,6 +8,7 @@
 package com.salesforce.slds.validation.validators.interfaces;
 
 import com.salesforce.slds.shared.models.context.Context;
+import com.salesforce.slds.shared.models.core.Bundle;
 import com.salesforce.slds.shared.models.core.Entry;
 import com.salesforce.slds.shared.models.override.ComponentOverride;
 
@@ -15,5 +16,5 @@
 
 public interface OverrideValidator extends Validator {
 
-    List<ComponentOverride> getOverrides(Entry entry, Context context);
+    List<ComponentOverride> getOverrides(Entry entry, Bundle bundle, Context context);
 }
diff --git a/core/src/main/java/com/salesforce/slds/validation/validators/interfaces/RecommendationValidator.java b/core/src/main/java/com/salesforce/slds/validation/validators/interfaces/RecommendationValidator.java
index 6a55acb..d62baa4 100644
--- a/core/src/main/java/com/salesforce/slds/validation/validators/interfaces/RecommendationValidator.java
+++ b/core/src/main/java/com/salesforce/slds/validation/validators/interfaces/RecommendationValidator.java
@@ -8,11 +8,12 @@
 package com.salesforce.slds.validation.validators.interfaces;
 
 import com.salesforce.slds.shared.models.context.Context;
+import com.salesforce.slds.shared.models.core.Bundle;
 import com.salesforce.slds.shared.models.core.Entry;
 import com.salesforce.slds.shared.models.recommendation.Recommendation;
 
 import java.util.List;
 
 public interface RecommendationValidator extends Validator {
-    List<Recommendation> matches(Entry entry, Context context);
+    List<Recommendation> matches(Entry entry, Bundle bundle, Context context);
 }
diff --git a/core/src/test/java/com/salesforce/slds/shared/utils/EntryUtilitiesTests.java b/core/src/test/java/com/salesforce/slds/shared/utils/EntryUtilitiesTests.java
index b0916c0..d15b272 100644
--- a/core/src/test/java/com/salesforce/slds/shared/utils/EntryUtilitiesTests.java
+++ b/core/src/test/java/com/salesforce/slds/shared/utils/EntryUtilitiesTests.java
@@ -53,7 +53,8 @@ void randomPath() {
 
         private void verify(String expected, String path) {
             Entry entry = Entry.builder().path(path).entityType(Entry.EntityType.OTHER).build();
-            assertThat(EntryUtilities.getComponentName(entry), Matchers.is(expected));
+            Bundle bundle = new Bundle(entry);
+            assertThat(EntryUtilities.getComponentName(bundle), Matchers.is(expected));
         }
     }
 
@@ -69,8 +70,8 @@ void componentWithoutPath() {
 
             Entry entry = Entry.builder().inputs(inputs).entityType(Entry.EntityType.AURA)
                     .path(COMPONENT_NAME + ".cmp").build();
-
-            assertThat(EntryUtilities.getComponentName(entry), Matchers.is(COMPONENT_NAME));
+            Bundle bundle = new Bundle(entry);
+            assertThat(EntryUtilities.getComponentName(bundle), Matchers.is(COMPONENT_NAME));
         }
 
         @Test
@@ -81,8 +82,8 @@ void componentWithPath() {
 
             Entry entry = Entry.builder().inputs(inputs).entityType(Entry.EntityType.LWC)
                     .path(File.separator + generatePath(COMPONENT_NAME, "test.html")).build();
-
-            assertThat(EntryUtilities.getComponentName(entry), Matchers.is(COMPONENT_NAME));
+            Bundle bundle = new Bundle(entry);
+            assertThat(EntryUtilities.getComponentName(bundle), Matchers.is(COMPONENT_NAME));
         }
 
         @Test
@@ -95,10 +96,8 @@ void bundleWithMarkup() {
                     generatePath(COMPONENT_NAME, "test.html")).build();
 
             Bundle bundle = new Bundle(bundledEntry);
-            Entry entry = Entry.builder().inputs(new ArrayList<>()).entityType(Entry.EntityType.LWC).build();
-            entry.setBundle(bundle);
 
-            assertThat(EntryUtilities.getComponentName(entry), Matchers.is(COMPONENT_NAME));
+            assertThat(EntryUtilities.getComponentName(bundle), Matchers.is(COMPONENT_NAME));
         }
 
         @Test
@@ -110,10 +109,8 @@ void bundleWithStyles() {
             Entry bundledEntry = Entry.builder().inputs(inputs).path(COMPONENT_NAME + ".css").build();
 
             Bundle bundle = new Bundle(bundledEntry);
-            Entry entry = Entry.builder().inputs(new ArrayList<>()).entityType(Entry.EntityType.LWC).build();
-            entry.setBundle(bundle);
 
-            assertThat(EntryUtilities.getComponentName(entry), Matchers.is(COMPONENT_NAME));
+            assertThat(EntryUtilities.getComponentName(bundle), Matchers.is(COMPONENT_NAME));
         }
     }
 
@@ -128,7 +125,8 @@ void lwcJavascript() {
             content.add("}");
 
             Entry entry = Entry.builder().rawContent(content).path("component.js").build();
-            assertThat(EntryUtilities.getType(entry), Matchers.is(Entry.EntityType.LWC));
+            Bundle bundle = new Bundle(entry);
+            assertThat(EntryUtilities.getType(bundle), Matchers.is(Entry.EntityType.LWC));
         }
 
         @Test
@@ -137,7 +135,8 @@ void javascript() {
             content.add("function test() {}");
 
             Entry entry = Entry.builder().inputs(new ArrayList<>()).rawContent(content).path("component.js").build();
-            assertThat(EntryUtilities.getType(entry), Matchers.is(Entry.EntityType.OTHER));
+            Bundle bundle = new Bundle(entry);
+            assertThat(EntryUtilities.getType(bundle), Matchers.is(Entry.EntityType.OTHER));
         }
 
         @Test
@@ -149,7 +148,8 @@ void lwcMarkup() {
             inputs.addAll(MarkupParser.parse( COMPONENT_NAME + ".html", content));
 
             Entry entry = Entry.builder().inputs(inputs).rawContent(content).path(COMPONENT_NAME + ".html").build();
-            assertThat(EntryUtilities.getType(entry), Matchers.is(Entry.EntityType.LWC));
+            Bundle bundle = new Bundle(entry);
+            assertThat(EntryUtilities.getType(bundle), Matchers.is(Entry.EntityType.LWC));
         }
 
         @Test
@@ -161,7 +161,8 @@ void auraLibrary() {
             inputs.addAll(MarkupParser.parse( COMPONENT_NAME + ".html", content));
 
             Entry entry = Entry.builder().inputs(inputs).rawContent(content).path(COMPONENT_NAME + ".html").build();
-            assertThat(EntryUtilities.getType(entry), Matchers.is(Entry.EntityType.AURA));
+            Bundle bundle = new Bundle(entry);
+            assertThat(EntryUtilities.getType(bundle), Matchers.is(Entry.EntityType.AURA));
         }
 
         @Test
@@ -173,7 +174,8 @@ void auraComponent() {
             inputs.addAll(MarkupParser.parse( COMPONENT_NAME + ".html", content));
 
             Entry entry = Entry.builder().inputs(inputs).rawContent(content).path(COMPONENT_NAME + ".html").build();
-            assertThat(EntryUtilities.getType(entry), Matchers.is(Entry.EntityType.AURA));
+            Bundle bundle = new Bundle(entry);
+            assertThat(EntryUtilities.getType(bundle), Matchers.is(Entry.EntityType.AURA));
         }
 
         @Test
@@ -185,7 +187,8 @@ void auraCSS() {
             inputs.addAll(CSSParser.parse(content));
 
             Entry entry = Entry.builder().inputs(inputs).rawContent(content).path(COMPONENT_NAME + ".css").build();
-            assertThat(EntryUtilities.getType(entry), Matchers.is(Entry.EntityType.AURA));
+            Bundle bundle = new Bundle(entry);
+            assertThat(EntryUtilities.getType(bundle), Matchers.is(Entry.EntityType.AURA));
         }
 
         @Test
@@ -198,7 +201,8 @@ void auraCSSWithComponentName() {
 
             Entry entry = Entry.builder().inputs(inputs).componentName(COMPONENT_NAME)
                     .rawContent(content).path(COMPONENT_NAME + ".css").build();
-            assertThat(EntryUtilities.getType(entry), Matchers.is(Entry.EntityType.AURA));
+            Bundle bundle = new Bundle(entry);
+            assertThat(EntryUtilities.getType(bundle), Matchers.is(Entry.EntityType.AURA));
         }
 
 
@@ -213,7 +217,8 @@ void lwcCSSWithHost() {
             Entry entry = Entry.builder().inputs(inputs).rawContent(content)
                     .componentName(COMPONENT_NAME)
                     .path(COMPONENT_NAME + ".css").build();
-            assertThat(EntryUtilities.getType(entry), Matchers.is(Entry.EntityType.LWC));
+            Bundle bundle = new Bundle(entry);
+            assertThat(EntryUtilities.getType(bundle), Matchers.is(Entry.EntityType.LWC));
         }
 
         @Test
@@ -227,7 +232,8 @@ void lwcCSSWithComponentName() {
             Entry entry = Entry.builder().inputs(inputs).rawContent(content)
                     .componentName(COMPONENT_NAME)
                     .path(COMPONENT_NAME + ".css").build();
-            assertThat(EntryUtilities.getType(entry), Matchers.is(Entry.EntityType.LWC));
+            Bundle bundle = new Bundle(entry);
+            assertThat(EntryUtilities.getType(bundle), Matchers.is(Entry.EntityType.LWC));
         }
     }
 }
diff --git a/core/src/test/java/com/salesforce/slds/validation/validators/AnnotationTest.java b/core/src/test/java/com/salesforce/slds/validation/validators/AnnotationTest.java
index 85a3967..8c1bfe7 100644
--- a/core/src/test/java/com/salesforce/slds/validation/validators/AnnotationTest.java
+++ b/core/src/test/java/com/salesforce/slds/validation/validators/AnnotationTest.java
@@ -9,6 +9,7 @@
 
 import com.salesforce.slds.configuration.SldsConfiguration;
 import com.salesforce.slds.shared.models.annotations.Annotation;
+import com.salesforce.slds.shared.models.core.Bundle;
 import com.salesforce.slds.shared.models.core.Entry;
 import com.salesforce.slds.shared.models.recommendation.Recommendation;
 import com.salesforce.slds.validation.runners.ValidateRunner;
@@ -71,11 +72,12 @@ private Entry process(String content) {
         Entry entry = Entry.builder().path(path)
                 .rawContent(Arrays.asList(StringUtils.delimitedListToStringArray(content, "\n")))
                 .build();
-        runner.setEntry(entry);
+        Bundle bundle = new Bundle(entry);
+        runner.setBundle(bundle);
 
         runner.run();
 
-        return runner.getEntry();
+        return runner.getBundle().getEntries().get(0);
     }
 
 }
diff --git a/core/src/test/java/com/salesforce/slds/validation/validators/CSSValidationTest.java b/core/src/test/java/com/salesforce/slds/validation/validators/CSSValidationTest.java
index 11445ed..67835cb 100644
--- a/core/src/test/java/com/salesforce/slds/validation/validators/CSSValidationTest.java
+++ b/core/src/test/java/com/salesforce/slds/validation/validators/CSSValidationTest.java
@@ -83,9 +83,9 @@ public void location() {
         builder.append(".THIS .gridContainer {width:100%}");
 
         Entry css = createEntry(CSS_PATH, builder.toString());
-        css.setBundle(new Bundle(getComponentEntry()));
+        Bundle bundle = new Bundle(css, getComponentEntry());
 
-        Map<String, List<Recommendation>> groupedRecommendation = process(css);
+        Map<String, List<Recommendation>> groupedRecommendation = process(bundle);
 
         assertThat(groupedRecommendation.get(".THIS .gridContainer {width:100%}"), Matchers.iterableWithSize(1));
 
@@ -144,9 +144,9 @@ public void blockAnnotation() {
                 .append(".THIS thead { display: block; }");
 
         Entry css = createEntry(CSS_PATH, builder.toString());
-        css.setBundle(new Bundle(getComponentEntry()));
+        Bundle bundle = new Bundle(css, getComponentEntry());
 
-        Map<String, List<Recommendation>> groupedRecommendation = process(css);
+        Map<String, List<Recommendation>> groupedRecommendation = process(bundle);
         assertThat(groupedRecommendation, Matchers.aMapWithSize(1));
     }
 
@@ -216,9 +216,9 @@ public void utilityClasses() {
                 .append("}");
 
         Entry cssEntry = createEntry(CSS_PATH, builder.toString());
-        cssEntry.setBundle(new Bundle(getComponentEntry()));
+        Bundle bundle = new Bundle(cssEntry, getComponentEntry());
 
-        Map<String, List<Recommendation>> groupedRecommendation = process(cssEntry);
+        Map<String, List<Recommendation>> groupedRecommendation = process(bundle);
 
         assertThat(cssEntry.getRecommendation(), Matchers.iterableWithSize(4));
         assertThat(groupedRecommendation.get(".THIS thead, .THIS .hideSpinner {display:none}"), Matchers.iterableWithSize(1));
@@ -242,9 +242,9 @@ public void utilityClassesWithMultipleDeclaration() {
                 .append("}");
 
         Entry cssEntry = createEntry(CSS_PATH, builder.toString());
-        cssEntry.setBundle(new Bundle(getComponentEntry()));
+        Bundle bundle = new Bundle(cssEntry, getComponentEntry());
 
-        Map<String, List<Recommendation>> groupedRecommendation = process(cssEntry);
+        Map<String, List<Recommendation>> groupedRecommendation = process(bundle);
 
         assertThat(cssEntry.getRecommendation(), Matchers.iterableWithSize(1));
         Recommendation recommendation = groupedRecommendation.get(".THIS thead {margin-left:auto; margin-right:auto; display:table}").get(0);
@@ -276,9 +276,9 @@ public void literalNameClass() {
                 .append(System.lineSeparator())
                 .append("</aura:component>");
 
-        cssEntry.setBundle(new Bundle(createEntry("modalContainer.cmp", component.toString())));
+        Bundle bundle = new Bundle(cssEntry, createEntry("modalContainer.cmp", component.toString()));
 
-        Map<String, List<Recommendation>> groupedRecommendation = process(cssEntry);
+        Map<String, List<Recommendation>> groupedRecommendation = process(bundle);
 
         assertThat(groupedRecommendation.get(".cModalContainer {display:none}"), Matchers.iterableWithSize(1));
     }
@@ -300,9 +300,10 @@ public void literalComponentReference() {
                 .append(System.lineSeparator())
                 .append("</aura:component>");
 
-        cssEntry.setBundle(new Bundle(createEntry("modalContainer.cmp", component.toString())));
+        Bundle bundle = new Bundle(cssEntry,
+                createEntry("modalContainer.cmp", component.toString()));
 
-        Map<String, List<Recommendation>> groupedRecommendation = process(cssEntry);
+        Map<String, List<Recommendation>> groupedRecommendation = process(bundle);
 
         assertThat(groupedRecommendation.get(".cModalContainer.cModalContainer__wrapper {display:none}"), Matchers.iterableWithSize(1));
     }
@@ -392,10 +393,15 @@ private Map<String, List<Recommendation>> process(String content) {
     }
 
     private Map<String, List<Recommendation>> process(Entry entry) {
-        runner.setEntry(entry);
+        return process(new Bundle(entry));
+    }
+
+    private Map<String, List<Recommendation>> process(Bundle bundle) {
+        runner.setBundle(bundle);
         runner.run();
 
-        List<Recommendation> recommendations = runner.getEntry().getRecommendation();
+        List<Recommendation> recommendations = runner.getBundle().getEntries().stream().map(Entry::getRecommendation)
+                .flatMap(List::stream).collect(Collectors.toList());
         return
                 recommendations.stream().collect(Collectors.groupingBy(o ->
                         o.getStyle() != null ? o.getStyle().getValue() : o.getRuleSet().toString()
diff --git a/core/src/test/java/com/salesforce/slds/validation/validators/ComponentOverrideTest.java b/core/src/test/java/com/salesforce/slds/validation/validators/ComponentOverrideTest.java
index 9916623..60bc0b6 100644
--- a/core/src/test/java/com/salesforce/slds/validation/validators/ComponentOverrideTest.java
+++ b/core/src/test/java/com/salesforce/slds/validation/validators/ComponentOverrideTest.java
@@ -8,6 +8,7 @@
 package com.salesforce.slds.validation.validators;
 
 import com.salesforce.slds.configuration.SldsConfiguration;
+import com.salesforce.slds.shared.models.core.Bundle;
 import com.salesforce.slds.shared.models.core.Entry;
 import com.salesforce.slds.shared.models.locations.Location;
 import com.salesforce.slds.shared.models.locations.Range;
@@ -24,6 +25,7 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 
@@ -59,13 +61,15 @@ public void prepare() {
         Entry entry = Entry.builder().path("test.css")
                 .rawContent(Arrays.asList(StringUtils.delimitedListToStringArray(builder.toString(), "\n")))
                 .build();
-        runner.setEntry(entry);
+        Bundle bundle = new Bundle(entry);
+        runner.setBundle(bundle);
         runner.run();
 
     }
 
     public List<ComponentOverride> getComponentOverrides() {
-        return runner.getEntry().getOverrides();
+        return runner.getBundle().getEntries().stream().map(Entry::getOverrides)
+                .flatMap(List::stream).collect(Collectors.toList());
     }
 
     @Test
diff --git a/core/src/test/java/com/salesforce/slds/validation/validators/JavascriptValidationTest.java b/core/src/test/java/com/salesforce/slds/validation/validators/JavascriptValidationTest.java
index cc04bd0..941139d 100644
--- a/core/src/test/java/com/salesforce/slds/validation/validators/JavascriptValidationTest.java
+++ b/core/src/test/java/com/salesforce/slds/validation/validators/JavascriptValidationTest.java
@@ -7,14 +7,17 @@
 
 package com.salesforce.slds.validation.validators;
 
+import com.google.common.collect.Lists;
 import com.salesforce.slds.configuration.SldsConfiguration;
 import com.salesforce.slds.shared.models.core.Block;
+import com.salesforce.slds.shared.models.core.Bundle;
 import com.salesforce.slds.shared.models.core.Entry;
 import com.salesforce.slds.shared.models.core.Input;
 import com.salesforce.slds.shared.models.locations.Location;
 import com.salesforce.slds.shared.models.locations.Range;
 import com.salesforce.slds.shared.models.recommendation.Action;
 import com.salesforce.slds.shared.models.recommendation.Recommendation;
+import com.salesforce.slds.shared.parsers.javascript.JavascriptParser;
 import com.salesforce.slds.validation.runners.ValidateRunner;
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Test;
@@ -27,10 +30,7 @@
 import java.io.IOException;
 import java.net.URL;
 import java.nio.file.Files;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -48,16 +48,20 @@ public void libraryParsing() throws IOException {
         File f = new File(resource.getFile());
 
         Entry entry = Entry.builder().path(f.getPath()).rawContent(Files.readAllLines(f.toPath())).build();
-        runner.setEntry(entry);
+        List<Input> inputs = Lists.newArrayList(JavascriptParser.convert(f.getPath(), Files.readAllLines(f.toPath())));
+        entry.setInputs(inputs);
+        Bundle bundle = new Bundle(entry);
+        runner.setBundle(bundle);
 
-        List<Block> blocks = runner.getInputs().stream()
-                .map(Input::asBlock).collect(Collectors.toList());
+        List<Block> blocks = runner.getBundle().getInputs().stream()
+                .map(Input::asBlock).filter(Objects::nonNull).collect(Collectors.toList());
 
         assertThat(blocks, Matchers.iterableWithSize(7));
 
         runner.run();
 
-        List<Recommendation> recommendations = runner.getEntry().getRecommendation();
+        List<Recommendation> recommendations = runner.getBundle().getEntries().stream().map(Entry::getRecommendation)
+                .flatMap(List::stream).collect(Collectors.toList());
         assertThat(recommendations, Matchers.iterableWithSize(1));
 
         Recommendation recommendation = recommendations.get(0);
@@ -87,15 +91,19 @@ public void helperParsing() throws IOException {
         File f = new File(resource.getFile());
 
         Entry entry = Entry.builder().path(f.getPath()).rawContent(Files.readAllLines(f.toPath())).build();
-        runner.setEntry(entry);
+        List<Input> inputs = Lists.newArrayList(JavascriptParser.convert(f.getPath(), Files.readAllLines(f.toPath())));
+        entry.setInputs(inputs);
+        Bundle bundle = new Bundle(entry);
+        runner.setBundle(bundle);
 
-        List<Block> blocks = runner.getInputs().stream()
-                .map(Input::asBlock).collect(Collectors.toList());
+        List<Block> blocks = runner.getBundle().getInputs().stream()
+                .map(Input::asBlock).filter(Objects::nonNull).collect(Collectors.toList());
         assertThat(blocks, Matchers.hasSize(2));
 
         runner.run();
 
-        List<Recommendation> recommendations = runner.getEntry().getRecommendation();
+        List<Recommendation> recommendations = runner.getBundle().getEntries().stream().map(Entry::getRecommendation)
+                .flatMap(List::stream).collect(Collectors.toList());
         assertThat(recommendations, Matchers.iterableWithSize(1));
 
         Recommendation recommendation = recommendations.get(0);
@@ -125,15 +133,19 @@ public void es6Parsing() throws IOException {
         File f = new File(resource.getFile());
 
         Entry entry = Entry.builder().path(f.getPath()).rawContent(Files.readAllLines(f.toPath())).build();
-        runner.setEntry(entry);
+        List<Input> inputs = Lists.newArrayList(JavascriptParser.convert(f.getPath(), Files.readAllLines(f.toPath())));
+        entry.setInputs(inputs);
+        Bundle bundle = new Bundle(entry);
+        runner.setBundle(bundle);
 
-        List<Block> blocks = runner.getInputs().stream()
-                .map(Input::asBlock).collect(Collectors.toList());
+        List<Block> blocks = runner.getBundle().getInputs().stream()
+                .map(Input::asBlock).filter(Objects::nonNull).collect(Collectors.toList());
         assertThat(blocks, Matchers.hasSize(1));
 
         runner.run();
 
-        List<Recommendation> recommendations = runner.getEntry().getRecommendation();
+        List<Recommendation> recommendations = runner.getBundle().getEntries().stream().map(Entry::getRecommendation)
+                .flatMap(List::stream).collect(Collectors.toList());
         assertThat(recommendations, Matchers.iterableWithSize(0));
     }
 }
diff --git a/core/src/test/java/com/salesforce/slds/validation/validators/MarkupValidationTest.java b/core/src/test/java/com/salesforce/slds/validation/validators/MarkupValidationTest.java
index 7317440..98fb5a2 100644
--- a/core/src/test/java/com/salesforce/slds/validation/validators/MarkupValidationTest.java
+++ b/core/src/test/java/com/salesforce/slds/validation/validators/MarkupValidationTest.java
@@ -8,9 +8,8 @@
 package com.salesforce.slds.validation.validators;
 
 import com.salesforce.slds.configuration.SldsConfiguration;
+import com.salesforce.slds.shared.models.core.Bundle;
 import com.salesforce.slds.shared.models.core.Entry;
-import com.salesforce.slds.shared.models.core.HTMLElement;
-import com.salesforce.slds.shared.models.core.Input;
 import com.salesforce.slds.shared.models.locations.Location;
 import com.salesforce.slds.shared.models.locations.Range;
 import com.salesforce.slds.shared.models.recommendation.Action;
@@ -48,11 +47,13 @@ public void expression1Parsing() throws IOException {
         File f = new File(resource.getFile());
 
         Entry entry = Entry.builder().path(f.getPath()).rawContent(Files.readAllLines(f.toPath())).build();
-        runner.setEntry(entry);
+        Bundle bundle = new Bundle(entry);
+        runner.setBundle(bundle);
 
         runner.run();
 
-        List<Recommendation> recommendations = runner.getEntry().getRecommendation();
+        List<Recommendation> recommendations = runner.getBundle().getEntries().stream().map(Entry::getRecommendation)
+                .flatMap(List::stream).collect(Collectors.toList());
         assertThat(recommendations, Matchers.hasSize(1));
 
         Recommendation recommendation = recommendations.get(0);
@@ -78,13 +79,15 @@ public void expression2Parsing() throws IOException {
         File f = new File(resource.getFile());
 
         Entry entry = Entry.builder().path(f.getPath()).rawContent(Files.readAllLines(f.toPath())).build();
-        runner.setEntry(entry);
+        Bundle bundle = new Bundle(entry);
+        runner.setBundle(bundle);
 
         runner.run();
 
-        assertThat(runner.getInputs(), Matchers.hasSize(14));
+        assertThat(runner.getBundle().getInputs(), Matchers.hasSize(14));
 
-        List<Recommendation> recommendations = runner.getEntry().getRecommendation();
+        List<Recommendation> recommendations = runner.getBundle().getEntries().stream().map(Entry::getRecommendation)
+                .flatMap(List::stream).collect(Collectors.toList());
         assertThat(recommendations, Matchers.hasSize(6));
     }
 }
diff --git a/lsp/src/main/java/com/salesforce/slds/lsp/Server.java b/lsp/src/main/java/com/salesforce/slds/lsp/Server.java
index f46d301..4630735 100644
--- a/lsp/src/main/java/com/salesforce/slds/lsp/Server.java
+++ b/lsp/src/main/java/com/salesforce/slds/lsp/Server.java
@@ -5,6 +5,7 @@
 import com.salesforce.slds.lsp.registries.TextDocumentRegistry;
 import com.salesforce.slds.lsp.services.TextDocumentServiceImpl;
 import com.salesforce.slds.lsp.services.interfaces.StateService;
+import com.salesforce.slds.shared.models.core.Bundle;
 import com.salesforce.slds.shared.models.core.Entry;
 import com.salesforce.slds.shared.utils.EntryUtilities;
 import org.eclipse.lsp4j.*;
@@ -75,10 +76,8 @@ CompletableFuture<String> provideContext(TextDocumentIdentifier params) {
 
         try {
 
-            Entry entry = diagnoser.createEntry(item);
-            entry.setBundle(diagnoser.getBundle(item));
-
-            Entry.EntityType type = EntryUtilities.getType(entry);
+            Bundle bundle = diagnoser.getBundle(item);
+            Entry.EntityType type = EntryUtilities.getType(bundle);
 
             return CompletableFuture.completedFuture(type == Entry.EntityType.AURA ? "aura" : "other");
 
diff --git a/lsp/src/main/java/com/salesforce/slds/lsp/diagnostics/Diagnoser.java b/lsp/src/main/java/com/salesforce/slds/lsp/diagnostics/Diagnoser.java
index 00d572d..9dcd222 100644
--- a/lsp/src/main/java/com/salesforce/slds/lsp/diagnostics/Diagnoser.java
+++ b/lsp/src/main/java/com/salesforce/slds/lsp/diagnostics/Diagnoser.java
@@ -30,6 +30,7 @@
 import java.nio.file.Files;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
 
 @Component
 public class Diagnoser {
@@ -59,13 +60,15 @@ public void diagnose(TextDocumentItem item) {
 
             runner.setContext(stateService.getContext());
 
-            Entry entry = createEntry(item);
-            entry.setBundle(getBundle(item));
+            Bundle bundle = getBundle(item);
+            runner.setBundle(bundle);
 
-            runner.setEntry(entry);
             runner.run();
 
-            List<DiagnosticResult> diagnostics = converter.convert(entry);
+            Optional<Entry> result = bundle.getEntries().stream()
+                    .filter(entry -> entry.getPath().equalsIgnoreCase(item.getUri())).findFirst();
+
+            List<DiagnosticResult> diagnostics = converter.convert(result.get());
             diagnosticRegistry.put(item.getUri(), diagnostics);
 
         } catch (Exception ex) {
@@ -89,7 +92,7 @@ public Bundle getBundle(TextDocumentItem entry) throws IOException {
         File originalFile = new File(URI.create(entry.getUri()));
 
         for (File f : originalFile.getParentFile().listFiles(Diagnoser::isLightningComponentFiles)) {
-            if (f.isFile() && f.equals(originalFile) == false) {
+            if (f.isFile()) {
                 TextDocumentItem item = documentRegistry.get(f.toURI().toString());
                 if (item != null) {
                     bundle.getEntries().add(createEntry(item));
diff --git a/lsp/src/main/java/com/salesforce/slds/lsp/registries/DiagnosticResultRegistry.java b/lsp/src/main/java/com/salesforce/slds/lsp/registries/DiagnosticResultRegistry.java
index 6046bd1..2bd25c5 100644
--- a/lsp/src/main/java/com/salesforce/slds/lsp/registries/DiagnosticResultRegistry.java
+++ b/lsp/src/main/java/com/salesforce/slds/lsp/registries/DiagnosticResultRegistry.java
@@ -8,6 +8,8 @@
 package com.salesforce.slds.lsp.registries;
 
 import java.io.File;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -52,7 +54,12 @@ List<DiagnosticResult> getDiagnosticResults(String uri) {
     }
 
     private String translate(String uri) {
-        return new File(uri).toURI().toString();
+        try {
+            URI result = new URI(uri);
+            return result.toString();
+        } catch (URISyntaxException e) {
+            return new File(uri).toURI().toString();
+        }
     }
 
     void clear() {
diff --git a/lsp/src/test/java/com/salesforce/slds/lsp/RecommendationTests.java b/lsp/src/test/java/com/salesforce/slds/lsp/RecommendationTests.java
index 8225349..e9a1147 100644
--- a/lsp/src/test/java/com/salesforce/slds/lsp/RecommendationTests.java
+++ b/lsp/src/test/java/com/salesforce/slds/lsp/RecommendationTests.java
@@ -6,6 +6,7 @@
 import com.salesforce.slds.lsp.models.DiagnosticResult;
 import com.salesforce.slds.lsp.registries.DiagnosticResultRegistry;
 import com.salesforce.slds.lsp.registries.TextDocumentRegistry;
+import com.salesforce.slds.shared.models.core.Bundle;
 import com.salesforce.slds.shared.models.core.Entry;
 import com.salesforce.slds.validation.runners.ValidateRunner;
 import org.eclipse.lsp4j.*;
@@ -231,7 +232,7 @@ private Entry createEntry(String name, Entry.EntityType type, String content ) {
         Entry entry = Entry.builder().path(name).entityType(type).rawContent(
                 Arrays.asList(StringUtils.delimitedListToStringArray(content, System.lineSeparator()))).build();
 
-        runner.setEntry(entry);
+        runner.setBundle(new Bundle(entry));
         runner.run();
 
         return entry;
diff --git a/lsp/src/test/java/com/salesforce/slds/lsp/diagnostics/DiagnoserTests.java b/lsp/src/test/java/com/salesforce/slds/lsp/diagnostics/DiagnoserTests.java
index a2f95f3..c36c874 100644
--- a/lsp/src/test/java/com/salesforce/slds/lsp/diagnostics/DiagnoserTests.java
+++ b/lsp/src/test/java/com/salesforce/slds/lsp/diagnostics/DiagnoserTests.java
@@ -73,7 +73,7 @@ public void bundle() throws IOException {
 
         Bundle bundle = diagnoser.getBundle(item);
 
-        assertThat(bundle.getEntries(), Matchers.hasSize(2));
+        assertThat(bundle.getEntries(), Matchers.hasSize(3));
 
         Optional<Entry> actualStyleEntry = getEntry(bundle, STYLE);
         assertStyle(actualStyleEntry);