Added comments and users