Added Type field to BasicUserModel