Making enhanced user object optional