Solutions support

@viart Do we care?