Solutions support

@mlu-appear you are right