Refactored the CurrentUser into a single object.