WCP-122 Refactor user data model