Migrated to thymeleaf & added JPA