Add comment views and related code