Refine User class