Adding extends and debug tags.