Added partial support for verbose mode