Improve console