Changed UserData to UserApp.UserData, removed TypeClass