Rewriting of Universe class.
Universe class finalised