Update and rename User to AccountClassSkeleton