Update according to review feedbacks