included changes in providers and new modules