Add (un)comment support