Improve console mode