Added updated support to provider, refactord some stuff into library