Revert "Revert "Removed dependencies to Core in provider""

This reverts commit bb2a4355d7a8559e170ac1a040b1a97dc924229e.