Updated User Entity in preparation for Spring Security