Added support for unknown solutions