Improve User 7 CurrentUser classes and examples