adjust to changes on trunk - table user_data does no longer exist