Added comment container class to Component classes