Adding support for any solution structure