Enhanced comments