Add comments and model method