Updated getUniverse() and all