Use new universe API