Changed verbose handling