Refactored to simplify OneDUniverse intialization