Adding more control over debug output