Added additional fields to universe model