Completed refactoring if TUser and Admin User and dependent objects and
data objects.