SC#1045: Refactored mixplan solution