Change to console wrapper