Refact provider to works with manager
Adding Manager