Adding more functionality to Debug