added comments management