Added functionality for comments