Added types and providers