Feature/icoreprovider