Add better debugging capabilities