Added comment scaffold