Removed the Provider class, since it's useless