Fixed template for new solution