Added some debugging code as data attributes