Added comment extraction