Added functionality for user comments