little refactoring - providers added