UserData & WPModel changes, DB fix