Add comments base classes ans templates