Add debug and annotation comments