Added debug/markup framework