Add more return object for 'solve' function in the plan