Revert "Revert "Added Debug data""

This reverts commit 9c0e0bfb0207d7c08317370de96954170f6b4c46.