Much better console integration