Add solution structure and output