Add functionality regarding comments