Adding proper solution structure