Restructured User class