Comments functionality added