Major update of universe functions