diff --git a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/Annotations.java b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/Annotations.java
index 19885dbf5..d18030544 100644
--- a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/Annotations.java
+++ b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/Annotations.java
@@ -20,4 +20,24 @@ public class Annotations {
 	public static final String PROFILE = "org.springframework.context.annotation.Profile";
 	public static final String COMPONENT = "org.springframework.stereotype.Component";
 	public static final String AUTOWIRED = "org.springframework.beans.factory.annotation.Autowired";
+
+	public static final String CONDITIONAL = "org.springframework.context.annotation.Conditional";
+	public static final String CONDITIONAL_ON_BEAN = "org.springframework.boot.autoconfigure.condition.ConditionalOnBean";
+	public static final String CONDITIONAL_ON_MISSING_BEAN = "org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean";
+	public static final String CONDITIONAL_ON_PROPERTY = "org.springframework.boot.autoconfigure.condition.ConditionalOnProperty";
+	public static final String CONDITIONAL_ON_RESOURCE = "org.springframework.boot.autoconfigure.condition.ConditionalOnResource";
+	public static final String CONDITIONAL_ON_CLASS = "org.springframework.boot.autoconfigure.condition.ConditionalOnClass";
+	public static final String CONDITIONAL_ON_MISSING_CLASS = "org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass";
+	public static final String CONDITIONAL_ON_CLOUD_PLATFORM = "org.springframework.boot.autoconfigure.condition.ConditionalOnCloudPlatform";
+	public static final String CONDITIONAL_ON_WEB_APPLICATION = "org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication";
+	public static final String CONDITIONAL_ON_NOT_WEB_APPLICATION = "org.springframework.boot.autoconfigure.condition.ConditionalOnNotWebApplication";
+	public static final String CONDITIONAL_ON_ENABLED_INFO_CONTRIBUTOR = "org.springframework.boot.actuate.autoconfigure.ConditionalOnEnabledInfoContributor";
+	public static final String CONDITIONAL_ON_ENABLED_RESOURCE_CHAIN = "org.springframework.boot.autoconfigure.web.ConditionalOnEnabledResourceChain";
+	public static final String CONDITIONAL_ON_ENABLED_ENDPOINT = "org.springframework.boot.actuate.condition.ConditionalOnEnabledEndpoint";
+	public static final String CONDITIONAL_ON_ENABLED_HEALTH_INDICATOR = "org.springframework.boot.actuate.autoconfigure.ConditionalOnEnabledHealthIndicator";
+	public static final String CONDITIONAL_ON_EXPRESSION = "org.springframework.boot.autoconfigure.condition.ConditionalOnExpression";
+	public static final String CONDITIONAL_ON_JAVA = "org.springframework.boot.autoconfigure.condition.ConditionalOnJava";
+	public static final String CONDITIONAL_ON_JNDI = "org.springframework.boot.autoconfigure.condition.ConditionalOnJndi";
+	public static final String CONDITIONAL_ON_SINGLE_CANDIDATE = "org.springframework.boot.autoconfigure.condition.ConditionalOnSingleCandidate";
+
 }
diff --git a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/BootJavaLanguageServer.java b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/BootJavaLanguageServer.java
index 41be1c788..d83fcf4f8 100644
--- a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/BootJavaLanguageServer.java
+++ b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/BootJavaLanguageServer.java
@@ -263,45 +263,41 @@ public class BootJavaLanguageServer extends SimpleLanguageServer {
 		providers.put(Annotations.COMPONENT, new ComponentInjectionsHoverProvider());
 		providers.put(Annotations.BEAN, new BeanInjectedIntoHoverProvider());
 
-		providers.put(org.springframework.ide.vscode.boot.java.conditionals.Constants.CONDITIONAL,
+		providers.put(Annotations.CONDITIONAL,
 				new ConditionalsLiveHoverProvider());
-		providers.put(org.springframework.ide.vscode.boot.java.conditionals.Constants.CONDITIONAL_ON_BEAN,
+		providers.put(Annotations.CONDITIONAL_ON_BEAN,
 				new ConditionalsLiveHoverProvider());
-		providers.put(org.springframework.ide.vscode.boot.java.conditionals.Constants.CONDITIONAL_ON_MISSING_BEAN,
+		providers.put(Annotations.CONDITIONAL_ON_MISSING_BEAN,
 				new ConditionalsLiveHoverProvider());
-		providers.put(org.springframework.ide.vscode.boot.java.conditionals.Constants.CONDITIONAL_ON_PROPERTY,
+		providers.put(Annotations.CONDITIONAL_ON_PROPERTY,
 				new ConditionalsLiveHoverProvider());
-		providers.put(org.springframework.ide.vscode.boot.java.conditionals.Constants.CONDITIONAL_ON_RESOURCE,
+		providers.put(Annotations.CONDITIONAL_ON_RESOURCE,
 				new ConditionalsLiveHoverProvider());
-		providers.put(org.springframework.ide.vscode.boot.java.conditionals.Constants.CONDITIONAL_ON_CLASS,
+		providers.put(Annotations.CONDITIONAL_ON_CLASS,
 				new ConditionalsLiveHoverProvider());
-		providers.put(org.springframework.ide.vscode.boot.java.conditionals.Constants.CONDITIONAL_ON_MISSING_CLASS,
+		providers.put(Annotations.CONDITIONAL_ON_MISSING_CLASS,
 				new ConditionalsLiveHoverProvider());
-		providers.put(org.springframework.ide.vscode.boot.java.conditionals.Constants.CONDITIONAL_ON_CLOUD_PLATFORM,
+		providers.put(Annotations.CONDITIONAL_ON_CLOUD_PLATFORM,
 				new ConditionalsLiveHoverProvider());
-		providers.put(org.springframework.ide.vscode.boot.java.conditionals.Constants.CONDITIONAL_ON_WEB_APPLICATION,
+		providers.put(Annotations.CONDITIONAL_ON_WEB_APPLICATION,
 				new ConditionalsLiveHoverProvider());
-		providers.put(
-				org.springframework.ide.vscode.boot.java.conditionals.Constants.CONDITIONAL_ON_NOT_WEB_APPLICATION,
+		providers.put(Annotations.CONDITIONAL_ON_NOT_WEB_APPLICATION,
 				new ConditionalsLiveHoverProvider());
-		providers.put(
-				org.springframework.ide.vscode.boot.java.conditionals.Constants.CONDITIONAL_ON_ENABLED_INFO_CONTRIBUTOR,
+		providers.put(Annotations.CONDITIONAL_ON_ENABLED_INFO_CONTRIBUTOR,
 				new ConditionalsLiveHoverProvider());
-		providers.put(
-				org.springframework.ide.vscode.boot.java.conditionals.Constants.CONDITIONAL_ON_ENABLED_RESOURCE_CHAIN,
+		providers.put(Annotations.CONDITIONAL_ON_ENABLED_RESOURCE_CHAIN,
 				new ConditionalsLiveHoverProvider());
-		providers.put(org.springframework.ide.vscode.boot.java.conditionals.Constants.CONDITIONAL_ON_ENABLED_ENDPOINT,
+		providers.put(Annotations.CONDITIONAL_ON_ENABLED_ENDPOINT,
 				new ConditionalsLiveHoverProvider());
-		providers.put(
-				org.springframework.ide.vscode.boot.java.conditionals.Constants.CONDITIONAL_ON_ENABLED_HEALTH_INDICATOR,
+		providers.put(Annotations.CONDITIONAL_ON_ENABLED_HEALTH_INDICATOR,
 				new ConditionalsLiveHoverProvider());
-		providers.put(org.springframework.ide.vscode.boot.java.conditionals.Constants.CONDITIONAL_ON_EXPRESSION,
+		providers.put(Annotations.CONDITIONAL_ON_EXPRESSION,
 				new ConditionalsLiveHoverProvider());
-		providers.put(org.springframework.ide.vscode.boot.java.conditionals.Constants.CONDITIONAL_ON_JAVA,
+		providers.put(Annotations.CONDITIONAL_ON_JAVA,
 				new ConditionalsLiveHoverProvider());
-		providers.put(org.springframework.ide.vscode.boot.java.conditionals.Constants.CONDITIONAL_ON_JNDI,
+		providers.put(Annotations.CONDITIONAL_ON_JNDI,
 				new ConditionalsLiveHoverProvider());
-		providers.put(org.springframework.ide.vscode.boot.java.conditionals.Constants.CONDITIONAL_ON_SINGLE_CANDIDATE,
+		providers.put(Annotations.CONDITIONAL_ON_SINGLE_CANDIDATE,
 				new ConditionalsLiveHoverProvider());
 
 		return new BootJavaHoverProvider(this, javaProjectFinder, providers, runningAppProvider);