use updated comment model and fields