Added comment manager