Add for Spring Boot Support