Hotfixes: Return full run object, return consumption model values