Removed URI factory to simply config