Add structured comments