restructured the user schema