Updated getCurrentUser to return the proper user class