Performance and verbose improvement.