Added new comment handler