Added solution structure