Missed some properties when deleted the Provider class...