Commenting functionality added