Refactoring singleton creation to handle and honor config options