Added Thymeleaf support